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

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

This reverts commit b53bfac92ddc270f83a2255f8df6b314d11ae0f7.
Revert "[1/2] Frameworks: Optional statusbar battery icons"
This revert this @5de91ceac853cbfb7314e4f5dc712f72431b3359