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: b468efc7 am: e0047a81

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



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