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

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



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