am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer: open audio sink in...
am 1ec00eab: (-s ours) Merge "DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown."
* commit '1ec00eab':
DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from timeout teardown.