Merge "Add CarrierConfig to TelephonySubscriptionSnapshot"