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