Allow home button to wake device [2/2]

Change-Id: I5c887422636f8bc51cb324339b3cdcac7af54400
Merge "Allow home button to wake device [2/2]" into lollipop