Merge changes I5c190938,I9abec5d2,If1007966 into rvc-qpr-dev am: 24038f61c5

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

Change-Id: I1d811c26e8611cf435ef1a31b74c18d7b1d71320