Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am:...

Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 77efd5f4 am: f8c140c5 am: fa980fa4

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



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