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

Change-Id: Ic2932b7fd206c72de0fe78fd604effd8603cc8e7