[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: dd518ed6 -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: I7c0ff1caf64f70b963785757c0d7c8b7beb2ec28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>