am e07a8d35: (-s ours) 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 'e07a8d35bbf4fa723fadc980f1d0aa605a457bb8':
  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