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

Change-Id: I418a5275d5ff6148eb5405589a1f89d3d2fa3f4e