More Halo Styles thanks to ATTACK (2/2)

Change-Id: I4a0d1d4ad4bc66ce235f3c169fe98b8d020769b5
Merge branch 'Domination' of github.com:Domination-42/android_frameworks_base into Domination

Change-Id: I4281c78ffb88640edc86bdb3918b0d59e564ea4b