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: 1d063c85 am: 4af2a13e am: 53c10f3e

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



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