Merge changes from topic "am-e50002f3308e4819a6eaab15b26b823d" into udc-dev am: 8d6ea092 -s ours

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

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



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