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

* commit '989947fc849a50c4a4e8b61f02b708b18b844e0d':
  PhoneAccount -> SubId for use in TelephonyManager#line1Number