Merge "Introduce an interface for getSubIdForPhoneAccountHandle"