Merge changes from topic "am-9a960a4d467e4f7390805f1ddabcce24" into...

Merge changes from topic "am-9a960a4d467e4f7390805f1ddabcce24" into udc-d1-dev-plus-aosp am: afd3d0b1 am: 0cef83f7

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



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