am d887377a: Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0

* commit 'd887377aa84f0d422cf605dad981f8dc53c0f99f':
  Fix power key handling after volume change. Bug: 5497716