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

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



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