Merge changes I69bc716c,Ifc184548,I74075402 into udc-dev am: 0c919fc12a

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

Change-Id: Ib211602d6d97c608b5aef3e455a04016e3e6d18e
Signed-off-by: Automerger Merge Worker <[email protected]>