Merge changes from topic "am-f412cfa4cb9e46a7988cc77b34b658c1" into rvc-qpr-dev-plus-aosp am: 609f594f

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

Change-Id: Iadaf114743f16d80c29718b7d7003b9081b79e4b