[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: 946443b1 -s ours am: d344dffc -s ours am: 9a970aea -s ours am: 1f74d704 -s ours

am skip reason: subject contains skip directive

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



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