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

Change-Id: I95991e5b2151f689b27e32bd5f187dc4615f1bf0