Merge "Audio focus: API for external audio focus policy" into oc-dev