Merge changes Iac69f180,I99b6cc0e into udc-dev am: c505edcb

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



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