Merge changes I64307527,Id230f8b1 into udc-dev am: 53026af5 am: 15eb6fd5 am: 15dfb4c0

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



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