Merge "Make getSubIdForPhoneAccountHandle Public" am: dfd0429259
am: 64acf9cdd9

Change-Id: I9d72269119a5686fe0e3aae18ab1e0faab8664ce