Merge changes from topic "am-c05949c3313d4e8f9d263c0afa334a51" into...

Merge changes from topic "am-c05949c3313d4e8f9d263c0afa334a51" into udc-d1-dev-plus-aosp am: d766ff8c -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/+/24309523



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