[2/2] Settings: bring back the status bar activity indicators for mobile data and wifi

And make them optional.

Fixed errors

PS6: Rebase to pick up new strings

PS7:Fix My Derp

Change-Id: I110b24917c34ca1deb5b697196c3d0949bcc8ae7