Merge changes Iee5024b8,Ic8afc2eb into udc-dev am: 41c62534 am: f4886a71 am: 8cc5566e

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



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