[automerger skipped] Unstick AM am: ed6bccd828 am: b9f2ba2d14 -s ours

am skip reason: Change-Id Iceeb3851aed0ba9b1c2c50b1a2378df06faa29d6 with SHA-1 ed809da358 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7157cab02fb2173c622c6d52031ab6f8eb7e8b93