am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1

* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
  Wake on volume key when in dock. Bug: 5580373