Merge "Move configs to CarrierConfig for MobileNetworkSettings" am: a9ca5c9999
am: 8a45ac103e

Change-Id: I12f1c1f0df3c9138023cdc6b4e9b564a36406849