Merge "Add subscription specific TelephonyManager calls." into nyc-dev