Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d am: 8c4224a0 am: 2909a2ae

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

Change-Id: Iffde12f1612d01c2da95f0f79beb82e3a4b040a8