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

Change-Id: Id2b92b5e7df5f45701b3204e03a0f1b1c4769980