[automerger skipped] [automerger] Sanitize effect descriptors for...

[automerger skipped] [automerger] Sanitize effect descriptors for AudioPolicyService binder calls. am: 50a46661 am: 32e8258b am: 372796ef am: 035496d7 am: bcc51ec8 am: 7a541948 am: 18308ee1 am: 2bc2ace9 skipped: 2f8f0ac6 am: b1cbbb01  -s ours am: 8ec90bfe  -s ours am: af91a550  -s ours
am: 85e60a58  -s ours

Change-Id: I3f7a0530c497ab88e96dd14cdcdd7de9e57dbde5