Merge "Merge changes I04f6a54e,Ifb505f6d,Ia9ec3ce2,I97b201c6,Ia12e8cd6, ......

Merge "Merge changes I04f6a54e,Ifb505f6d,Ia9ec3ce2,I97b201c6,Ia12e8cd6, ... into udc-dev am: 9c7f1199 am: b1d590e6" into udc-d1-dev-plus-aosp am: f3920147

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



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