[automerger skipped] Merge "Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into qt-dev am: 7b254210fe am: b5a3db3e8e am: f11fc22605" into qt-qpr1-dev-plus-aosp
am: c0c54e1324 -s ours
am skip reason: change_id Ib33f5b592185a67204997213bab1ac2594d90d37 with SHA1 7307293e8b is in history

Change-Id: Id4a0b007de6077dc8566d2609178ff595b5574b2