Merge changes from topic "am-62ae382898bb4b39a6c7d9fa84314e11" into udc-dev-plus-aosp am: 688378c9 am: 771b43bd am: 54b6d6ea

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



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