Merge changes from topic "am-72ba767aee1d4586aa1d4b234c285269" into rvc-qpr-dev-plus-aosp am: 21c016bb

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

Change-Id: I71956e919b6eb287ec2db6c9020cfa29c6dee029