[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into qt-dev am: 7b254210fe am: b5a3db3e8e am: b5dd7ae0b9
am: 95db15bbbd -s ours
am skip reason: change_id Ib33f5b592185a67204997213bab1ac2594d90d37 with SHA1 ddf87effa4 is in history

Change-Id: I5905492bdc4842e359e29987866bb1c8018921e9