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

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



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