[automerger skipped] Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9
am: 3835293aea
am: 3d73b7a832
-s ours
am skip reason: Change-Id I437a6e325112bf9d031a4eb11c28cb755c085bee with SHA-1 af4b43535f
is in history
Change-Id: I34e6c966514d9c326ace2d7d17d5ffbb32aabeb0
This commit is contained in: