[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-1e22850d61034a298d7b80c3c61a3e7a" into udc-d1-dev-plus-aosp am: fda4f5d3 -s ours am: 02f7edf7 -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/+/24309523



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