[2/2] Settings: Optional statusbar battery icons
    * Circle battery and circle battery percent (from CM <Sven Dawitz>)
    * Battery bar percent from Google
    * Quicksetting battery tile reflects status icon (from SlimROM <kufikugel>)

    - Option appears under Settings -> Battery -> Status Icon (ActionBar)

Part 1: frameworks_base

Patch set 1: clean white spaces
Patch set 2: fix conflicts

Signed-off-by: Anu6is <curtis.mayers@gmail.com>

Change-Id: Iae497e495045ca68522ab0b5bd342e044d4000f3