[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 skip reason: Merged-In I6dd163d7b5e5be00be3aaa57a13606e8105ccf9c with SHA-1 2438d56c is already in history

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



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