Merge changes from topic "am-ddb5311c68fa48239f4d4ff72503ba5c" into udc-dev am: b4a610d0

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



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