Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d am: 8392b1b8 am: 6add7f27

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028

Change-Id: I34f325f3e4606fccd319f470eecdfd50452043e7