[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9ad4faab -s ours am: adc09114 -s ours am: 63d29afa -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b313fdc24ca11d5164bc4bfaea7a50abc677db8