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 am: 88b6e6f0

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



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