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

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 6b260079 -s ours am: 9f3c1103 -s ours am: ed902857 -s ours am: 2dd64c60 -s ours am: 62bd9eea -s ours

am skip reason: subject contains skip directive

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



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