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

Change-Id: I5f0eb8b617d374f872bfcf592e4dd3fac6476a30