am 6ee9b57b: am dd6a1764: am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev

* commit '6ee9b57b06a40e2490911cd390e8528eda0b21c5':
  NuPlayerRenderer: handle error when resuming an offloaded track