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

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

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