Clean up battery profiles
    Add missing ifdef for n1

Change-Id: Ia9ac45e33f0f96960b3d508b57b019432449ec38
Merge "Clean up battery profiles     Add missing ifdef for n1" into kk4.4