Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev am: 085c91bedd
am: b66f7272ec

Change-Id: I018eaf2d2470583496b2578646bdb3f2dc9d3734