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

Change-Id: Ia665022e1d3357f68109905f976b84e89f66c045