Merge "Allow PhoneAccountHandle in SubscriptionInfoHelper"
am: b38a5c0c48

Change-Id: I2a959d8a33a7f74a1fe5bedf44c08d5ba360a77b