This reverts commit ba29dbc3b3. The original commit causes apps such as phone and clock to not wake the device. Fixes: 37197491 Change-Id: I1b45cafbcbf12991d8e1e716e4d1751cd077c556
ba29dbc3b3
d1a0d19794