[automerger skipped] Merge "Merge Android 12" am: c5b263d645 -s ours am: f2ef0dbb77 -s ours

am skip reason: Merged-In I0d9394aba092c75d423c96d258060353d0a3672c with SHA-1 1636d7ef22 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/skia/+/1847656

Change-Id: I5f7ce278fa2f2bad2d82cf44bafbe38b9cd7ad43