Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4  -s ours
am: 812594f573  -s ours

Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c