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 am: c499c529

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



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