Merge changes from topic "tc_change_23050307_35" into tm-qpr-dev-plus-aosp am: 6f943799

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



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