[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L09000000959180098:N55700001348327156" into udc-dev am: ff642bb9 am: a9cc157d -s ours

am skip reason: Merged-In I355bd4c55c96ada392d81cf89381870b9dc79c17 with SHA-1 5fa297d3 is already in history

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



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