Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev am: a08ba3ef31
am: 43c34ae003

Change-Id: If55c6cc4e9130359207a33cc006820313df8db96