Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: fcae259d am: 4e695a1e

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



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