Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into...

Merge changes from topic "am-98b9de0e504e4878968b66aca8c6c1d7" into udc-d1-dev-plus-aosp am: cf315e52 -s ours

am skip reason: Merged-In Ia887bd2ad00900eaad5f8fb34ed73ffcdf9f783a with SHA-1 44774823 is already in history

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



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