[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: dd518ed6 -s ours am: 73ec4917 -s ours am: 987e61ad -s ours

am skip reason: subject contains skip directive

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



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