Merge changes Iebbc5d77,I2bef5f6f into udc-dev am: c6ffe347 am: 2101a1c0

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



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