[automerger skipped] Merge "Make getSubIdForPhoneAccountHandle Public" am: dfd0429259 am: 64acf9cdd9
am: adf7e57fd2 -s ours
am skip reason: change_id I563760d0e68cbcae597ccd297f184ee9efdf3367 with SHA1 9ac2d6b08b is in history

Change-Id: Iedc609b37a62f3e451cc31b7c246e2411f34e4e9