Merge "audio policy: fix global effect attachment" into oc-dev am: 6cb102d4a1
am: e8e0c41538

Change-Id: I17c5c6f22951eb685068132503f943bc84f2f20f