Merge changes I4d700bc4,I14fdac19,I66159f36 into udc-dev am: 430789ea am: 4ba7124b

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



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