Merge "Make getSubIdForPhoneAccountHandle Public"
am: dfd0429259

Change-Id: I5626161730f242d96eb821ed72ecc0e8c7cfbb27