[automerger skipped] RESTRICT AUTOMERGE - resolve merge conflicts of...

[automerger skipped] RESTRICT AUTOMERGE - resolve merge conflicts of dab37c25 to qt-qpr1-dev am: ec0754c9 -s ours am: 8537cde3 -s ours am: b60b4588 -s ours am: d4e19b28 -s ours am: cbe03291 -s ours am: 0fd10f21 -s ours am: 97deacc5 -s ours am: dc293f59 -s ours am: 7b3efc57 -s ours

am skip reason: subject contains skip directive

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



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