[automerger skipped] Merge "Move configs to CarrierConfig for MobileNetworkSettings" am: a9ca5c99 am: 8a45ac10 am: df2fc731 -s ours Change-Id: I6078593ec1c7dd0647fa45dad88d24fcb8c65ee4