[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: 14d22090 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iccfc5a34c1710fd8a00ac9a0a3661c1e151765c2