[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-7e96eae02a5b484e9919093ff21ef7d9" into udc-d1-dev-plus-aosp am: df9f6dce -s ours am: 2db72dee -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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