Merge changes from topic "am-d8b191b5b56e48e78ffe3bcb86b8c5f4" into udc-dev...

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

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



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