Merge "Fix getSimOperator to return mccmnc based on subId" am: 87a336846e
am: 44dc116739

Change-Id: I16df51378764d9d62abe8c87c242e5a3a6c3b8ba