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

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



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