[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-98d2611d93db4ee1a8bd296e4f2dd9ac" into udc-d1-dev-plus-aosp am: c4d6c6e6 -s ours am: 36846d6f -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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