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: bd95923c am: cbb87f77

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



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