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

More Infos:
https://github.com/XXMrHyde/android_frameworks_base/commit/30810876272298b8b54de63cddfe4e6a870e52e0

Change-Id: I1ffb6f55e2558c3a07c8113da10b8d3dadc1cafe