Refactor of ApnSettings Bug: 150567855 Test: make Change-Id: I1af5e30006a9e68316968807a2532e13398c7af4