Merge changes from topic "am-d8b191b5b56e48e78ffe3bcb86b8c5f4" into udc-dev am: d9022f16

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



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