Merge "PhoneWindowManager/KeyEvent: Camera key as WakeKey"