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

Change-Id: I89cb08511728d6e5adecb8b90323c6a22259d590
1 file changed