Merge changes I02fb643b,If62d66bc into udc-dev am: b9de8fb7 am: 8104694f am: 365f9dc2 am: ac21815b

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



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