[automerger skipped] Merge TP1A.221005.003 am: 68870e5583 -s ours

am skip reason: Merged-In Ie8b57e20927d90e45b0f69a23a6777af7a39794d with SHA-1 b0451e5f2c is already in history

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

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