[automerger skipped] Merge "Merge TP1A.221105.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TP1A.221105.002 to aosp-master - DO NOT MERGE" am: de51c486 -s ours am: f59db3f2 -s ours am: de230cca -s ours

am skip reason: subject contains skip directive

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



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