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

Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: 5f7ef792 am: b8a3c647 am: 6be697a2

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



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