Merge "Do not use hidden PhoneStateListener.mSubId"