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

am skip reason: Merged-In Idb83b101eee8f7ec38e5b0f7d685fd41695796f2 with SHA-1 1817208a is already in history

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



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