[automerger skipped] Merge TP1A.221005.003 am: 68870e55 -s ours am: a6efe6b9 -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: If56444eaf41e4b40e259d57d03b710cd1cd7616a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>