Merge changes from topic "am-03bdf3eec27d44b8b1ee7793a389d3f7" into...

Merge changes from topic "am-03bdf3eec27d44b8b1ee7793a389d3f7" into udc-d1-dev-plus-aosp am: d621040c -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b32712 is already in history

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



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