am cfdee882: am 08f59877: am 82b34505: Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev

* commit 'cfdee882d2633301b5fbd4c52fed3152551c8f00':
  NuPlayerRenderer: Do not drain audio during teardown