Merge "Do not use hidden PhoneStateListener.mSubId" am: 180d9d78a6 am: aa749403c7 am: d738073b3f

Change-Id: Ief6850915acaa608926029802fad6af623ec2a99