[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-c85b8786af084e679d5b97124802a87e" into udc-dev-plus-aosp am: e1917bbd -s ours am: 8d425134 -s ours

am skip reason: Merged-In I687f35f4989f9e23276451c9b3a3ce8578e64280 with SHA-1 0687f9d3 is already in history

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



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