Merge changes I339886d1,Id53bfc8c into udc-dev am: 7f4445dfd1 am: 5cb37f47d8 am: 9c4319e4df am: ce079d1ab5

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

Change-Id: I277466575dcf833888af082444e53a92451bf80d
Signed-off-by: Automerger Merge Worker <[email protected]>