Merge "Continue playing audio if output to local device is selected by the...
Merge "Continue playing audio if output to local device is selected by the user" am: 88b2826b am: c569c07b
am: 3c61af32
Change-Id: I7fb8cf953c85efdc89f8d750466250fb43ec192f