Revert "Battery Text: Fix rounding issues and take density into account"

This reverts commit ffc410efa0afd391331d00eeb48cd75e76abc473.
Revert "SystemUI: Update circle battery UI to be in line with CM"

This reverts commit b53bfac92ddc270f83a2255f8df6b314d11ae0f7.
Merge branch 'psoa_r1' of https://github.com/EuclideanROM/platform_frameworks_base into psoa_r1