Merge changes from topic "tc_change_23050307_45" into tm-qpr-dev-plus-aosp am: d7543f65

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



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