Merge "Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4  -s ours am: 812594f573 am: 45bd03914c  -s ours" into oc-dev-plus-aosp
am: 7750ab39b2

Change-Id: Id41aad8e09009a52be5731de1679d154757c935f