Merge "Merge changes If8cf0831,Ib3203643,I8e7455dd into udc-dev am: 3fdc0c48...

Merge "Merge changes If8cf0831,Ib3203643,I8e7455dd into udc-dev am: 3fdc0c48 am: 1d2ed15a" into udc-d1-dev-plus-aosp am: cefcbf10

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



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