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

Change-Id: I7fdec39374578ca2c3ca0d34b50d32842cf7efc0