Merge "Change getSubIdForPhoneAccountHandle to getSubscriptionId"