Merge changes from topic "am-f77f5991f56f4f61b3596258ce67ff9d" into udc-dev am: 70e3d208 -s ours

am skip reason: Merged-In Ic7f350618c26a613df455a4128c9195f4b424a4d with SHA-1 7c11a18c is already in history

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



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