[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 6b260079 -s ours

am skip reason: Merged-In I00ca36e7ec8eea08f4b7ec6808a83c845dfc09ce with SHA-1 6cd39dfe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2058988



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