[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-e50002f3308e4819a6eaab15b26b823d" into udc-dev am: 8d6ea092 -s ours am: ae36d4ad -s ours

am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 c60e264a is already in history

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



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