Merge changes from topic "am-aaa541aa6c1945d6b5ad1ccc8f1bf978" into udc-dev-plus-aosp am: d8a623f5 -s ours

am skip reason: Merged-In I1b0a9d667cd481e91cfe473747a9ad38f77b4455 with SHA-1 c7ffdf8b is already in history

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



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