Merge "Handle error result from DrmManagerClient correctly"