Merge "Introduce an interface for getSubIdForPhoneAccountHandle"
am: e66d674a27

Change-Id: Icd1d1c5585a6c472320cb3bcf54182b956da4847