[automerger skipped] Fix merge am: face1a1d -s ours am: 4b3e41b1 -s ours am: fbb43426 -s ours

am skip reason: Merged-In I82bb1676c85ac7ebdb607dcc36dbb54f95ad3fce with SHA-1 7309cb35 is already in history

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



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