[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L13400000959215506:N79400001348786532" into udc-dev am: 65a2a1e7 am: 7e38f987 -s ours

am skip reason: Merged-In I9f2dff736cf29661046a7995b58dd03a106efb16 with SHA-1 471556d1 is already in history

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



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