Fix mismerge of implement 1% battery on select devices

Change-Id: I2dcafba2c39f50cf435b90ca261b325c10fd5b6b
Animate ADB icon

Patch Set 3: Remove core/res/assets/images/android-logo-mask.png as it doesn't belong in this commit.

Change-Id: I1245cb6aa344976a50b58162905d0b9a0ee492e3
SystemUI: Fix alt signal layout & mobile type per app color

Change-Id: Icd3bbd1d4c71eeeb1d2ed34f8a365a5405c870d5
Add perApp color support to circle batt.

Change-Id: Icb62dcf00811240f4ee27f553a7c279222626788
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2