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

Change-Id: I1c4ddbf044df414cffa282d9e9aba4261b23a975