Merge "PhoneAccount -> SubId for use in TelephonyManager#line1Number" into lmp-mr1-dev