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

Change-Id: I6771fdd3408461fb8343006a05d15c260d0fb256