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

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



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