Merge changes from topic "am-df7bac20f576499eb8b154f337e435d2" into rvc-qpr-dev-plus-aosp am: cf1c61de

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

Change-Id: Iaa7fcce9721881b1f152b81a519963e7b5ee068c