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

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



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