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

Change-Id: I2a5d31c342efc7e3ca4f29448b24d406253c7b0f