Settings: Fix value from being overwritten with null.

After awhile this value becomes null for unknown reasons.
Switch back to a non-changing static final for the non-multi-sim case.

Change-Id: I9248a545ed35ec10048781b21a3e6a6b17e96d74
settings: Put MSIM files in the right place

Change-Id: I1e989d710510aff257f5ae3f6f402bb993b8da72
Merge pull request #2 from AOSPA-legacy/kitkat

1