[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev am: 1d2cccfd2a -s ours
am: 4a47595ece

Change-Id: I8d1c7e85cae5ec229198508240f00165e2b3fb40