Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b am: 9848ecebd2 am: c186a7f2a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871517 Change-Id: I721a92866d780c2ac811801be8b9bce0a7a84aa9
This commit is contained in: