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

Change-Id: Icf6d6418d7bc0fa6b3b79d8d3595d04f79d10778