Merge changes from topic "am-ff421f5c678447bf80a4adf729e40d01" into...

Merge changes from topic "am-ff421f5c678447bf80a4adf729e40d01" into rvc-qpr-dev-plus-aosp am: 7e407ef9

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

Change-Id: I16fb1909bf37ea3ca95814d412309618757079e4