Merge "Unhide API additions to AudioManager for AudioFocus support."