[automerger skipped] Merge "Merge TP1A.221005.003" am: d906119a -s ours am: a8fc93a8 -s ours

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

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



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