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

Change-Id: I69d54cd3ffdfa9b19e9de86dc8564747b4d6b229