[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 6f827231 -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 6f827231 -s ours am: 2146b1e6 -s ours am: bb183ef1 -s ours am: 5c4af490 -s ours

am skip reason: subject contains skip directive

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



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