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: c128a780 am: 13218ed6

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



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