Merge changes from topic "tc_change_23050307_36" into tm-qpr-dev-plus-aosp am: edad993f am: 167db668

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



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