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

Change-Id: I6e04b73fb204bab665e4829ba36fe56f5d2bae8e