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: ac895e01 am: 5a3182dd

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



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