Merge changes from topic "am-0bc409316ef841f78851eb2f2946b5e5" into rvc-qpr-dev-plus-aosp am: e975dc06

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

Change-Id: Iaa636dfea490f29c3254fabb03c67e45ad9553e7