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

Change-Id: Ie87640984e1dfcc72084cb3f0f31077eceeeb38f