Merge changes from topic "am-78a99633f9cc44cd9ea44ad541faff01" into rvc-qpr-dev-plus-aosp am: 94a52182

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

Change-Id: I42b2d94f324ebdb2711631e0195385d21f52ecba