Merge "[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO...

Merge "[automerger skipped] Merge "AudioFlinger: enforce OP_RECORD_AUDIO during recording" into pi-dev am: 1d2cccfd -s ours am: 4a47595e am: 678e0699 am: 39b4d74c" into qt-qpr1-dev-plus-aosp
am: a37cdc92 -s ours
am skip reason: change_id Ib33f5b592185a67204997213bab1ac2594d90d37 with SHA1 ddf87eff is in history

Change-Id: I28f02f5576d6893972d972954d34e495d27b2a7e