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

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



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