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

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



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