Merge changes from topic "tc_change_2305100725_34" into tm-qpr-dev-plus-aosp am: 2a2d6dc2 am: e044139e

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



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