Merge changes I339886d1,Id53bfc8c into udc-dev am: 7f4445df am: 5cb37f47...

Merge changes I339886d1,Id53bfc8c into udc-dev am: 7f4445df am: 5cb37f47 am: 9c4319e4 am: ce079d1a

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



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