Re-enable WifiMode and SmartBattery for Battery Saver Mode

Change-Id: Ie80952328cc958ff710c52675cad47c6b045d47a
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>