Merge "Introduce an interface for getSubIdForPhoneAccountHandle" am: e66d674a27
am: 0ae23529f4

Change-Id: I5cd7ff580c9c140327d2e36fefb49ddc0ac6fc99