Merge changes from topic "am-e3fad35317474c4f87d63b23fcb944f2" into udc-dev am: 67b5bb4b am: 78baf0fc am: 7616bf63

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



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