Commit cf0f932e authored May 04, 2022 by Xin Li Committed by Automerger Merge Worker May 04, 2022

[automerger skipped] Merge "Merge SP2A.220505.002" am: 3c7a3e39 -s ours

am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005 is already in history

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

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

There are no changes