Revert "Settings: use DefaultContainerService for all file operations"

This reverts commit b088d40627eaa311e61633085b3c6c0c643de7d7.
ApnSettings: Fix merge fail

Change-Id: Id22ea05b7495b1ef64386d05189761b3ec7d22b8