Merge changes I7d682bd0,I8ed6a31e into udc-dev am: c9174e2f am: ec6f3c0f am: edfc7258

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



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