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: Ic1a86842b15f02a07037d44a1d2b0f33db9c5d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>