Merge "Change getSubIdForPhoneAccountHandle to getSubscriptionId" am: 0c0591473b am: c020ac0261
am: 84387eb68b

Change-Id: Ia1cf17e5c6afdc3536054bda865bab43e077fa93