Merge changes I81bda912,I5ed93786 into udc-dev am: 9ccb30e3 am: 2f53c1c1

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



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