Merge "Change how TelephonyManager handles subscriptions." into nyc-dev