[automerger skipped] Merge changes from topic "am-831d7dc4d3954ca58fb60d7b575c9d4e" into udc-d1-dev-plus-aosp am: c558a34d -s ours am: 380ce85a -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/+/24309522



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