Merge changes from topic...

Merge changes from topic "presubmit-am-b58a01f1adec4c46ae37d132031c6dc4-udc-dev-tm-qpr-dev" into tm-qpr-dev-plus-aosp am: ce02cd4a am: 6b0cf3fd am: 55b96ce6

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



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