Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: ac895e01

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



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