Merge "Update TelephonySubscriptionTracker to use new CPCallback interface"