Merge "Handle error result from DrmManagerClient correctly"
am: f0d7854e93

* commit 'f0d7854e93696c4a10c98bc94d7b5f869c80493a':
  Handle error result from DrmManagerClient correctly