Merge "Audio focus: clean up FocusRequester early" into nyc-mr1-dev am: d9daf12b33 am: ab5339c439
am: 9d324812f3

Change-Id: I69f4c3542c05dc67f0264da838201fbae3fe3765