Merge changes from topic "tc_change_2305100725_41" into tm-qpr-dev-plus-aosp am: 62f23fed

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



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