Merge changes from topic "tc_change_23050307_34" into tm-qpr-dev-plus-aosp am: 63396de7 am: b95eefa8 am: 963577f6

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



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