am 25d6a1e6: Fix several bugs in HdmiControlService.

* commit '25d6a1e60fc31a52eb6e5069378374ba24aa6596':
  Fix several bugs in HdmiControlService.