Use proper header switch handling for AOSP Mode

Summary:
This is the correct way to manage header switches

Change-Id: Ied0cbe534ffadf0deb151b20f4a23d1996a1c9c1

Test Plan: final win for real

Reviewers: synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D341
Merge branch 'jb-devel-mr2-release' of github.com:codefireXperiment/packages_apps_settings into jb-devel-mr2-release