[automerger skipped] Merge "Sanitize effect descriptors for AudioPolicyService binder calls." into oc-dev am: c06bd330d4 am: df0b29eecf am: 2b56665ec1  -s ours
am: 1cdd674121  -s ours

Change-Id: If94b26bdc8182c89378482cb6d1d098bf61ed216