Merge changes I58a9c06b,I08bedeca into udc-dev am: 83f861dc13

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

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