Merge "PhoneWindowManager/KeyEvent: Camera key as WakeKey" am: dec76b8a40 am: 1841f6af1d
am: de67a21c84

Change-Id: I6c8450688f79394195e493877156e67330d022ff