Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd am: 969a6eb2b8
am: c9698a5cff

Change-Id: I35bbcf29868c1ecddcdbb0e536c6d2a92e4d90ca