[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev am: 1d2cccfd2a -s ours am: 4a47595ece am: 678e069993 am: 63b47f918c
am: b698c452db -s ours
am skip reason: change_id Ib33f5b592185a67204997213bab1ac2594d90d37 with SHA1 ddf87effa4 is in history

Change-Id: I6c110b3e9b33aaa0eac457fa8f1b56807a703111