Merge changes from topic "am-6a6e230918694e3c86e11859c011628c" into rvc-qpr-dev-plus-aosp am: 73b135e4

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

Change-Id: Iaeff962b5d3877b4fd7a4331f71756bbab31f440