Merge changes I05fa65f3,Ie576d9ce into udc-dev am: b26dc33dda

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

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