Merge "Change getSubIdForPhoneAccountHandle to getSubscriptionId"
am: 0c0591473b

Change-Id: I2a5d24a2eca31e6e99f9bc794fdf854ac96e4ece