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

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

Change-Id: I2d6eb9bbc142e7da1a270a9bea22d645b6f54885