Merge "Add audio_policy_configuration"
am: 0f2911a5d6

Change-Id: I2452dd753d0fa73a72a13318bb313c0e358fe2fe