[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-bb7b13d87e39490782a2d1c51b44a168" into udc-dev-plus-aosp am: d8025d4e -s ours am: 60666361 -s ours

am skip reason: Merged-In I6f4d2a35e89bbed7bd9e07bf5cd3e2d68b20af9a with SHA-1 ad7af765 is already in history

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



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