Re-enable standalone power collapse on d2 and apex devices

Change-Id: I20ece0b0ffc356e5d8a9112dba505a65f7f85fc3
Merge "Re-enable standalone power collapse on d2 and apex devices" into cm-10.2