[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: 31fa37e2 -s ours am: 408429f6 -s ours am: b95ee653 -s ours am: 1eff034f -s ours am: 95e70a75 -s ours

am skip reason: subject contains skip directive

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



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