[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am:...

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: a477f831 -s ours am: a6fd6676 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I62f82568c186b9768650001970f06a005683e454