[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L06600000959260644:N82800001349763665" into udc-dev am: 05ee5fc9 am: f8e580c2 -s ours

am skip reason: Merged-In Idb83b101eee8f7ec38e5b0f7d685fd41695796f2 with SHA-1 3e832d27 is already in history

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



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