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

Change-Id: I03e45c39b9c198363952cfe6fbb270f60b429e64