Merge "audiopolicy: apm: factorize internal patch creation/release" am: 7505ec7cd4 am: 9e8500051f

Change-Id: I2dce8a1deb5722ebf55b2ff1ded23e62e9c948e5