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

* commit '71ed608ea7cfb349bba06c5f6bb17b525a4fd964':
  Wake on volume key when in dock. Bug: 5580373