am a707633d: am 25d6a1e6: Fix several bugs in HdmiControlService.

* commit 'a707633db594b85604a2bddb0cfac333232ce0ad':
  Fix several bugs in HdmiControlService.