[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed813 am: 9ea0b244 -s ours

am skip reason: Merged-In I26ef88df4f6267b5e8b89f1588f2382db74030c0 with SHA-1 bdcbf558 is already in history

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



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