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

Change-Id: Ibceebbfa8bdb0c83bbf31be222a3bf243568747a