Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea

Change-Id: I9750d2b07e3b6280d2e3e9e2779f2740d24f0cdf