[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-395d884ace17496d9309ec3247ff26d0" into udc-dev am: bf3401b6 -s ours am: b0430d2f -s ours

am skip reason: Merged-In If1c14cc0a4e3fbdfbed2c105d37ece9a866f18ed with SHA-1 9a5cab13 is already in history

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



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