Merge changes I7c6f57a2,I86b6d31a into rvc-qpr-dev am: a1603bbd9f am: 6f54008cc1

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

Change-Id: I188394b4540dc100394efcaa15d49cb065a95559