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: b468efc7 am: e0047a81 am: d3855744

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



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