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: f8224dbb am: 921f83db

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



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