am ac2fcd8c: Do not merge. Fix audio focus issue some more. We now start playing immediately when regaining focus, and set all the associated state variables accordingly, so that very rapid focus loss/gain changes can be handled correctly. b/3209106

* commit 'ac2fcd8cde17ad86f20956f22555bac1c4b719c8':
  Do not merge. Fix audio focus issue some more. We now start playing immediately when regaining focus, and set all the associated state variables accordingly, so that very rapid focus loss/gain changes can be handled correctly. b/3209106