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

Change-Id: I75560995231567a348c08c9e06f5f1b82e2ea273