[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: 051b8fa1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If5c758a22b2edce88705cefe14f6473c1be73e8e