Merge changes from topic "tc_change_23041115_23" into tm-qpr-dev-plus-aosp am:...

Merge changes from topic "tc_change_23041115_23" into tm-qpr-dev-plus-aosp am: 1214de74 am: 2f535b33

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



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