[automerger skipped] Merge "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op" into...

[automerger skipped] Merge "DO NOT MERGE Add RECORD_AUDIO_OUTPUT app op" into rvc-qpr-dev-plus-aosp am: 0ecf6b6d -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ba9c2943f09aebe32b3855cbffb96a9bd131727