[automerger skipped] Merge "Move configs to CarrierConfig for MobileNetworkSettings" am: a9ca5c9999 am: 8a45ac103e
am: df2fc73166  -s ours

Change-Id: I6078593ec1c7dd0647fa45dad88d24fcb8c65ee4