[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev
am: 1d2cccfd2a -s ours
am skip reason: SHA1 1d2cccfd2a skipped by user jmtrivi

Change-Id: I314e39906408bff99d4e0a7cab95b8db640b4b63