Merge "Fix getSimOperator to return mccmnc based on subId"