Merge "AudioService: Focus: cleanup FocusOwner upon requestAudioFocus failure" am: 346f1bcf90

Change-Id: I2602e9a93a08b5c131be457e69e649ab3b4e13b0