Merge "Merge changes from topic...

Merge "Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4" into sc-qpr1-dev am: 75883154 am: 3151caee am: a4cd2104 am: f7f0bf54 am: 5d3c4c5a am: cb4185fc am: ab0a25e1 am: d2e53b4f" into udc-qpr-dev-plus-aosp am: 2e2bfe95

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



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