[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: b675f1fb -s ours am: 98dd136f -s ours

am skip reason: Merged-In I56350f4336da776a38ad86e2d53016340e825b6a with SHA-1 828ade30 is already in history

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

Change-Id: I7b361673ab63680b71076d55549dce924ee0241a