[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-699b1fd04be64b0c8b946358be3efbbb" into udc-d1-dev-plus-aosp am: e6a4c18a -s ours am: ab80268d -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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