[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-2860078308a34f39b65842736d7a6cab" into udc-d1-dev-plus-aosp am: 058a0527 -s ours am: 1fb65e84 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f57376 is already in history

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



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