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

Change-Id: Ifea8a9b93f0d8c1945f3b6c7b15159b08019b9f1