Vendor, CM: Merge battery status "Symbol (Android)" and "Symbol Mini (CM)" with "Theme default" function (3/3):

This will revert commit:
https://github.com/XXMrHyde/android_vendor_cm/commit/fccef757c018c2bdbabfba1068de54f2fe45db0a

Change-Id: Idaa8e8be79bb49720b51cfe593b802bab9996f45