[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-894d004b4e27477eb8ab38028cb8a92f" into udc-d1-dev-plus-aosp am: 8d7cbe45 -s ours am: 86b877ba -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b32712 is already in history

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



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