Merge "Notify keyguard of when power button is pressed." into oc-dev
am: dd273de09e

Change-Id: I2e8061b695e1823ea9ab7b46c8fdb78111601ced