[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: d962c153 -s ours

am skip reason: subject contains skip directive

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



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