Merge changes from topic "tc_change_23050307_53" into tm-qpr-dev-plus-aosp am: f601463b

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



Change-Id: Iebb294a2e6a60a6afbe467bcc784944388bf88fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>