Merge changes from topic "am-4a970f4566674f2fb202d4693e53b5a9" into...

Merge changes from topic "am-4a970f4566674f2fb202d4693e53b5a9" into udc-d1-dev-plus-aosp am: a2786176 -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 2c993153 is already in history

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



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