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

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