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

Merge changes I81bda912,I5ed93786 into udc-dev am: 9ccb30e3 am: ee7697fe am: 74fb98b5 am: 003d0e18

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



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