am 6e03b220: am d887377a: Merge "Fix power key handling after volume change....
am 6e03b220: am d887377a: Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0
* commit '6e03b220':
Fix power key handling after volume change. Bug: 5497716