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

Change-Id: Id7add4b500edfc8d04355556dcfbae442d51ff46