[automerger skipped] Merge "Merge SP2A.220505.002" am: 3c7a3e39 -s ours am: cf0f932e -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: I06706e80de1613a367b7191355ad4090056895a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>