Merge "Add audio_policy_configuration" am: 0f2911a5d6 am: f7362ac27d
am: 79dc724ea0

Change-Id: I6b6739be513428b34cd33d018594f1b8fec834ac