Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into...
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20 -s ours am: 812594f5
am: 45bd0391 -s ours
Change-Id: Iadf1027f7bc9d9bc31264341cb6797ae241882fd