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

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



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