Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8392b1b8ba

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

Change-Id: I55405a76b8eb3ab7833d0521f6cea5d3b2f3de44